diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index 4a9d6cc8..e6158e7d 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -122,16 +122,17 @@ def cli(ctx, environment, target, upload_port, project_dir, silent, verbose,
 
 class EnvironmentProcessor(object):
 
-    KNOWN_OPTIONS = (
-        "platform", "framework", "board", "board_mcu", "board_f_cpu",
-        "board_f_flash", "board_flash_mode", "build_flags", "src_build_flags",
-        "build_unflags", "src_filter", "extra_script", "targets",
-        "upload_port", "upload_protocol", "upload_speed", "upload_flags",
-        "upload_resetmethod", "lib_deps", "lib_ignore", "lib_extra_dirs",
-        "lib_ldf_mode", "lib_compat_mode", "piotest", "test_transport",
-        "test_ignore", "test_port", "debug_tool", "debug_port",
-        "debug_init_cmds", "debug_extra_cmds", "debug_server",
-        "debug_init_break", "debug_load_cmd")
+    KNOWN_OPTIONS = ("platform", "framework", "board", "board_mcu",
+                     "board_f_cpu", "board_f_flash", "board_flash_mode",
+                     "build_flags", "src_build_flags", "build_unflags",
+                     "src_filter", "extra_script", "targets", "upload_port",
+                     "upload_protocol", "upload_speed", "upload_flags",
+                     "upload_resetmethod", "lib_deps", "lib_ignore",
+                     "lib_extra_dirs", "lib_ldf_mode", "lib_compat_mode",
+                     "piotest", "test_transport", "test_ignore", "test_port",
+                     "debug_tool", "debug_port", "debug_init_cmds",
+                     "debug_extra_cmds", "debug_server", "debug_init_break",
+                     "debug_load_cmd")
 
     IGNORE_BUILD_OPTIONS = ("test_transport", "test_ignore", "test_port",
                             "debug_tool", "debug_port", "debug_init_cmds",
@@ -169,12 +170,13 @@ class EnvironmentProcessor(object):
             self.options[k] = self.options[k].strip()
 
         if not self.silent:
-            click.echo("[%s] Processing %s (%s)" % (
-                datetime.now().strftime("%c"),
-                click.style(self.name, fg="cyan", bold=True), "; ".join([
-                    "%s: %s" % (k, v.replace("\n", ", "))
-                    for k, v in self.options.items()
-                ])))
+            click.echo("[%s] Processing %s (%s)" %
+                       (datetime.now().strftime("%c"),
+                        click.style(self.name, fg="cyan", bold=True),
+                        "; ".join([
+                            "%s: %s" % (k, v.replace("\n", ", "))
+                            for k, v in self.options.items()
+                        ])))
             click.secho("-" * terminal_width, bold=True)
 
         self.options = self._validate_options(self.options)
@@ -357,9 +359,10 @@ def print_summary(results, start_time):
             err=status is False)
 
     print_header(
-        "[%s] Took %.2f seconds" % (
-            (click.style("SUCCESS", fg="green", bold=True) if successed else
-             click.style("ERROR", fg="red", bold=True)), time() - start_time),
+        "[%s] Took %.2f seconds" %
+        ((click.style("SUCCESS", fg="green", bold=True)
+          if successed else click.style("ERROR", fg="red", bold=True)),
+         time() - start_time),
         is_error=not successed)
 
 
diff --git a/platformio/managers/package.py b/platformio/managers/package.py
index db207594..c05b90f6 100644
--- a/platformio/managers/package.py
+++ b/platformio/managers/package.py
@@ -16,6 +16,7 @@ import codecs
 import hashlib
 import json
 import os
+import re
 import shutil
 from os.path import basename, getsize, isdir, isfile, islink, join
 from tempfile import mkdtemp
@@ -126,9 +127,6 @@ class PkgRepoMixin(object):
 
 class PkgInstallerMixin(object):
 
-    PATH_ESCAPE_CHARS = ("/", "\\", "?", "%", "*", ":", "|", '"', "<", ">",
-                         ".", "(", ")", "&", "#", ",", "'")
-
     SRC_MANIFEST_NAME = ".piopkgmanager.json"
 
     FILE_CACHE_VALID = "1m"  # 1 month
@@ -192,11 +190,9 @@ class PkgInstallerMixin(object):
         fu = FileUnpacker(source_path, dest_dir)
         return fu.start()
 
-    def get_install_dirname(self, manifest):
-        name = manifest['name']
-        for c in self.PATH_ESCAPE_CHARS:
-            if c in name:
-                name = name.replace(c, "_")
+    @staticmethod
+    def get_install_dirname(manifest):
+        name = re.sub(r"[^\da-z\_\-\. ]", "_", manifest['name'], flags=re.I)
         if "id" in manifest:
             name += "_ID%d" % manifest['id']
         return name