diff --git a/browserstack/local.py b/browserstack/local.py
index 43bc237..7536924 100644
--- a/browserstack/local.py
+++ b/browserstack/local.py
@@ -11,10 +11,15 @@ def __init__(self, key=None, binary_path=None, **kwargs):
   def __xstr(self, key, value):
     if key is None:
       return ['']
+    if len(key) > 1:
+      key = key.replace("_", "-")
+      key = "--" + key
+    else:
+      key = "-" + key
     if str(value).lower() == "true":
-      return ['-' + key]
+      return [key]
     else:
-      return ['-' + key, value]
+      return [key, value]
 
   def _generate_cmd(self):
     cmd = [self.binary_path, '-d', 'start', '-logFile', self.local_logfile_path, self.key]
diff --git a/setup.py b/setup.py
index 342bcbe..80f838e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 setup(
   name = 'browserstack-local',
   packages = ['browserstack'],
-  version = '1.2.2',
+  version = '1.2.4',
   description = 'Python bindings for Browserstack Local',
   author = 'BrowserStack',
   author_email = 'support@browserstack.com',