diff --git a/config/Readme.md b/config/Readme.md
index c8befd2..4729de9 100644
--- a/config/Readme.md
+++ b/config/Readme.md
@@ -1,6 +1,6 @@
 ## Config
 
-All config files must be in this folder. If there is no option to set this folder 
+All config files must be in this folder. If there is no option to set this folder
 directly, it has to be hardlinked.
 
 * `user_aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
index dc40577..90ba93c 100644
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@@ -451,7 +451,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		{
 			MessageBox(NULL,
 				(GetLastError() == ERROR_ACCESS_DENIED)
-			  ? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+				? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
 				: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
 			exit(1);
 		}
@@ -858,6 +858,11 @@ cmderOptions GetOption()
 				cmderOptions.cmderTask = szArgList[i + 1];
 				i++;
 			}
+			else if ((_wcsicmp(L"bash", szArgList[i]) == 0 || _wcsicmp(L"powershell", szArgList[i]) == 0) || PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir))
+			{
+				cmderOptions.cmderTask = szArgList[i];
+				i++;
+			}
 			else if (_wcsicmp(L"/title", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && PathFileExists(conEmuDir))
 			{
 				cmderOptions.cmderTitle = szArgList[i + 1];