diff --git a/FoliCon/FoliCon.csproj b/FoliCon/FoliCon.csproj
index edfe7d95..f0aee73d 100644
--- a/FoliCon/FoliCon.csproj
+++ b/FoliCon/FoliCon.csproj
@@ -4,13 +4,13 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>FoliCon</AssemblyName>
-    <Version>3.7.0</Version>
+    <Version>3.7.1</Version>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
 	  <!--<PublishTrimmed>true</PublishTrimmed>-->
     <ApplicationIcon>Resources\folicon Icon.ico</ApplicationIcon>
     <LangVersion>preview</LangVersion>
     <PackageVersion>3.7.0</PackageVersion>
-    <AssemblyVersion>3.7.0.0</AssemblyVersion>
+    <AssemblyVersion>3.7.1.0</AssemblyVersion>
     <Company>Dinesh Solanki</Company>
     <Description>Creates Folder icons for Movies, Serials, Music, and Games Folders
 dineshsolanki.github.io/folicon/</Description>
diff --git a/FoliCon/Modules/Util.cs b/FoliCon/Modules/Util.cs
index 7ef59871..6ff60ba8 100644
--- a/FoliCon/Modules/Util.cs
+++ b/FoliCon/Modules/Util.cs
@@ -634,5 +634,32 @@ public static int GetResultCount(bool isPickedById, dynamic result, string searc
         {
             return isPickedById ? result != null ? 1 : 0 : searchMode == "Game" ? result.Length : result.TotalResults;
         }
+        public static IDictionary<string, string> GetCmdArgs()
+        {
+            IDictionary<string, string> arguments = new Dictionary<string, string>();
+            var args = Environment.GetCommandLineArgs();
+
+            for (var index = 1; index < args.Length; index += 2)
+            {
+                var arg = args[index].Replace("--", "");
+                arguments.Add(arg, args[index + 1]);
+            }
+            return arguments;
+        }
+        public static void AddToContextMenu()
+        {
+            var commandS = $@"""{Process.GetCurrentProcess().MainModule?.FileName}"" --path ""%1""";
+            ApplicationHelper.RegisterContextMenuToDirectory("Merge Subtitles", commandS);
+            commandS = $@"""{Process.GetCurrentProcess().MainModule?.FileName}"" --path ""%V""";
+            ApplicationHelper.RegisterContextMenuToBackground("Merge Subtitles", commandS);
+            //Growl.SuccessGlobal("Merge Subtitle option added to context menu!");
+        }
+
+        public static void RemoveFromContextMenu()
+        {
+            ApplicationHelper.UnRegisterContextMenuFromDirectory("Merge Subtitles");
+            ApplicationHelper.UnRegisterCascadeContextMenuFromBackground("Merge Subtitles");
+            //Growl.InfoGlobal("Merge Subtitle option removed from context menu!");
+        }
     }
 }
\ No newline at end of file
diff --git a/FoliCon/ViewModels/AboutBoxViewModel.cs b/FoliCon/ViewModels/AboutBoxViewModel.cs
index 8384d3b1..8326d680 100644
--- a/FoliCon/ViewModels/AboutBoxViewModel.cs
+++ b/FoliCon/ViewModels/AboutBoxViewModel.cs
@@ -10,7 +10,7 @@ namespace FoliCon.ViewModels
 {
     public class AboutBoxViewModel : BindableBase, IDialogAware
     {
-        private string _title = "Folicon v3.7";
+        private string _title = "Folicon v3.7.1";
         private string _logo = "/Resources/folicon Icon.png";
 
         private string _description = LangProvider.GetLang("FoliConDescription");
diff --git a/FoliCon/ViewModels/MainWindowViewModel.cs b/FoliCon/ViewModels/MainWindowViewModel.cs
index 75466fea..1bafe048 100644
--- a/FoliCon/ViewModels/MainWindowViewModel.cs
+++ b/FoliCon/ViewModels/MainWindowViewModel.cs
@@ -209,6 +209,22 @@ public MainWindowViewModel(IDialogService dialogService)
                 .PersistOn(nameof(PropertyChanged));
             Services.Tracker.Track(this);
             Util.CheckForUpdate(true);
+            var cmdArgs = Util.GetCmdArgs();
+            if (!cmdArgs.ContainsKey("path")) return;
+            SelectedFolder = cmdArgs["path"];
+            var mode = cmdArgs["mode"];
+            if (mode != "Professional" && new List<string>()
+                {"Auto (Movies & TV Shows)","TV","Movie","Game"}.Contains(mode))
+            {
+                IconMode = "Poster";
+                SearchMode = mode;
+            }
+            else
+            {
+                IconMode = "Professional";
+            }
+            SearchAndMakeMethod();
+
         }
 
         private void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
diff --git a/FoliCon/Views/MainWindow.xaml b/FoliCon/Views/MainWindow.xaml
index 4be792fd..ad50369b 100644
--- a/FoliCon/Views/MainWindow.xaml
+++ b/FoliCon/Views/MainWindow.xaml
@@ -240,7 +240,7 @@
                         </ItemsPanelTemplate>
                     </StatusBar.ItemsPanel>
                     <StatusBarItem Grid.Column="0">
-                        <Label Content="{ex:Lang Key={Binding AppStatus}}" BorderThickness="0" />
+                        <Label Content="{Binding AppStatus}" BorderThickness="0" />
                     </StatusBarItem>
                     <Separator Grid.Column="1" />
                     <StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">