diff --git a/shadowsocks-csharp/Controller/PolipoRunner.cs b/shadowsocks-csharp/Controller/PolipoRunner.cs
index ae0b46f1..c3e098d9 100755
--- a/shadowsocks-csharp/Controller/PolipoRunner.cs
+++ b/shadowsocks-csharp/Controller/PolipoRunner.cs
@@ -20,6 +20,32 @@ namespace Shadowsocks.Controller
         static PolipoRunner()
         {
             temppath = Path.GetTempPath();
+            string[] commandLineArgs = Environment.GetCommandLineArgs();
+            for (int i = 0; i < commandLineArgs.Length; i++)
+            {
+                string commandLineArg = commandLineArgs[i];
+                if (commandLineArg.ToLower() == "/SameFolderForPolipo".ToLower())
+                {
+                    temppath = Environment.CurrentDirectory;
+                }
+                if (commandLineArg.ToLower() == "/PolipoFolder".ToLower())
+                {
+                    if (i == commandLineArgs.Length - 1)
+                    {
+                        System.Windows.Forms.MessageBox.Show("Polipo folder not specified.", "Error", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+                        throw new Exception("Polipo folder not specified");
+                    }
+                    else if (!IsDirectoryValid(commandLineArgs[i + 1]))
+                    {
+                        System.Windows.Forms.MessageBox.Show("Polipo folder not valid.", "Error", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+                        throw new Exception("Polipo folder not valid");
+                    }
+                    else
+                    {
+                        temppath = commandLineArgs[i + 1];
+                    }
+                }
+            }
             try
             {
                 FileManager.UncompressFile(temppath + "/ss_polipo.exe", Resources.polipo_exe);
@@ -122,5 +148,24 @@ namespace Shadowsocks.Controller
             }
             throw new Exception("No free port found.");
         }
+
+        public static bool IsDirectoryValid(string path)
+        {
+            try
+            {
+                if (new DirectoryInfo(path).Exists == true)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
     }
 }