diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
index ec36132980..c2725e9bf6 100644
--- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
+++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
@@ -274,4 +274,4 @@ namespace MediaBrowser.Common.Implementations.Security
             _isMbSupporterInitialized = false;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 05756bba2d..9725d7b06c 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -190,8 +190,8 @@ namespace MediaBrowser.Providers.MediaInfo
             var mediaStreams = mediaInfo.MediaStreams;
 
             video.TotalBitrate = mediaInfo.Bitrate;
-            //video.FormatName = (mediaInfo.Container ?? string.Empty)
-            //    .Replace("matroska", "mkv", StringComparison.OrdinalIgnoreCase);
+            video.FormatName = (mediaInfo.Container ?? string.Empty)
+                .Replace("matroska", "mkv", StringComparison.OrdinalIgnoreCase);
 
             // For dvd's this may not always be accurate, so don't set the runtime if the item already has one
             var needToSetRuntime = video.VideoType != VideoType.Dvd || video.RunTimeTicks == null || video.RunTimeTicks.Value == 0;
@@ -707,7 +707,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             // Try to eliminate menus and intros by skipping all files at the front of the list that are less than the minimum size
             // Once we reach a file that is at least the minimum, return all subsequent ones
-			var allVobs = _fileSystem.GetFiles(root)
+            var allVobs = new DirectoryInfo(root).EnumerateFiles("*", SearchOption.AllDirectories)
                 .Where(file => string.Equals(file.Extension, ".vob", StringComparison.OrdinalIgnoreCase))
                 .OrderBy(i => i.FullName)
                 .ToList();
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 80b7d230ab..d7b8b2aed4 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -214,7 +214,7 @@ namespace MediaBrowser.ServerApplication
                 fileSystem,
                 "MBServer",
                 nativeApp);
-            
+
             var initProgress = new Progress<double>();
 
             if (!runService)
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index dd9e5d5f00..ad0bd8a1af 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -21,6 +21,9 @@ namespace MediaBrowser.ServerApplication
         private ToolStripMenuItem cmdRestart;
         private ToolStripSeparator toolStripSeparator1;
         private ToolStripMenuItem cmdCommunity;
+        private ToolStripMenuItem cmdApiDocs;
+        private ToolStripMenuItem cmdSwagger;
+        private ToolStripMenuItem cmdGtihub;
 
         private readonly ILogger _logger;
         private readonly IServerApplicationHost _appHost;
@@ -63,6 +66,9 @@ namespace MediaBrowser.ServerApplication
             toolStripSeparator2 = new ToolStripSeparator();
             cmdConfigure = new ToolStripMenuItem();
             cmdBrowse = new ToolStripMenuItem();
+            cmdApiDocs = new ToolStripMenuItem();
+            cmdSwagger = new ToolStripMenuItem();
+            cmdGtihub = new ToolStripMenuItem();
             
             // 
             // notifyIcon1
@@ -80,6 +86,7 @@ namespace MediaBrowser.ServerApplication
             toolStripSeparator2,
             cmdRestart,
             toolStripSeparator1,
+            cmdApiDocs,
             cmdCommunity,
             cmdExit});
             contextMenuStrip1.Name = "contextMenuStrip1";
@@ -121,6 +128,24 @@ namespace MediaBrowser.ServerApplication
             // 
             cmdBrowse.Name = "cmdBrowse";
             cmdBrowse.Size = new System.Drawing.Size(208, 22);
+            // 
+            // cmdApiDocs
+            // 
+            cmdApiDocs.DropDownItems.AddRange(new ToolStripItem[] {
+            cmdSwagger,
+            cmdGtihub});
+            cmdApiDocs.Name = "cmdApiDocs";
+            cmdApiDocs.Size = new System.Drawing.Size(208, 22);
+            // 
+            // cmdSwagger
+            // 
+            cmdSwagger.Name = "cmdSwagger";
+            cmdSwagger.Size = new System.Drawing.Size(136, 22);
+            // 
+            // cmdGtihub
+            // 
+            cmdGtihub.Name = "cmdGtihub";
+            cmdGtihub.Size = new System.Drawing.Size(136, 22);
 
             cmdExit.Click += cmdExit_Click;
             cmdRestart.Click += cmdRestart_Click;
@@ -128,6 +153,9 @@ namespace MediaBrowser.ServerApplication
             cmdCommunity.Click += cmdCommunity_Click;
             cmdBrowse.Click += cmdBrowse_Click;
 
+            cmdSwagger.Click += cmdSwagger_Click;
+            cmdGtihub.Click += cmdGtihub_Click;
+
             _configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
 
             LocalizeText();
@@ -166,6 +194,9 @@ namespace MediaBrowser.ServerApplication
 
             cmdExit.Text = _localization.GetLocalizedString("LabelExit");
             cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
+            cmdGtihub.Text = _localization.GetLocalizedString("LabelGithub");
+            cmdSwagger.Text = _localization.GetLocalizedString("LabelApiDocumentation");
+            cmdApiDocs.Text = _localization.GetLocalizedString("LabelDeveloperResources");
             cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
             cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureServer");
             cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
@@ -211,6 +242,16 @@ namespace MediaBrowser.ServerApplication
             _appHost.Shutdown();
         }
 
+        void cmdGtihub_Click(object sender, EventArgs e)
+        {
+            BrowserLauncher.OpenGithub(_logger);
+        }
+
+        void cmdSwagger_Click(object sender, EventArgs e)
+        {
+            BrowserLauncher.OpenSwagger(_appHost, _logger);
+        }
+
         ~ServerNotifyIcon()
         {
             Dispose();
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 5b09ef0841..30ce35ee17 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5724.5")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5724.6")]