diff --git a/HISTORY.rst b/HISTORY.rst
index 14f6ca96..eeba00ab 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release History
 1.0.0 (?)
 ---------
 
+0.3.1 (2014-06-21)
+------------------
+
+* Fixed auto-installer for Windows OS (bug with %PATH% customisations)
+
 
 0.3.0 (2014-06-21)
 ------------------
diff --git a/platformio/__main__.py b/platformio/__main__.py
index 3b9be174..f1b052f8 100644
--- a/platformio/__main__.py
+++ b/platformio/__main__.py
@@ -35,7 +35,7 @@ class PlatformioCLI(MultiCommand):
 
 
 @command(cls=PlatformioCLI)
-@version_option(__version__, "platformio")
+@version_option(__version__, prog_name="platformio")
 def cli():
     pass
 
diff --git a/scripts/get-platformio.py b/scripts/get-platformio.py
index 79bf85d7..aff8ba6c 100644
--- a/scripts/get-platformio.py
+++ b/scripts/get-platformio.py
@@ -25,6 +25,8 @@ def fix_winpython_pathenv():
     # took these lines from the native "win_add2path.py"
     pythonpath = os.path.dirname(CURINTERPRETER_PATH)
     scripts = os.path.join(pythonpath, "Scripts")
+    if not os.path.isdir(scripts):
+        os.makedirs(scripts)
 
     with winreg.CreateKey(winreg.HKEY_CURRENT_USER, u"Environment") as key:
         try: