diff --git a/src/main.coffee b/src/main.coffee
index aeba1f1ee..2e20853b1 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -20,6 +20,8 @@ parseCommandLine = ->
   executedFrom = args['executed-from']
   pathsToOpen = if args._.length > 0 then args._ else null
   testMode = true if args['test']
+  wait = true if args['wait']
+  pid = args['pid']
   version = String fs.readFileSync(path.join(__dirname, '..', '..', 'version'))
 
   if args['resource-path']
@@ -32,4 +34,4 @@ parseCommandLine = ->
   catch e
     resourcePath = path.dirname(__dirname)
 
-  {resourcePath, executedFrom, pathsToOpen, testMode, version}
+  {resourcePath, executedFrom, pathsToOpen, testMode, version, wait, pid}