diff --git a/src/cli/cli-definitions.js b/src/cli/cli-definitions.js
index 15da7aa7..300a40c5 100644
--- a/src/cli/cli-definitions.js
+++ b/src/cli/cli-definitions.js
@@ -8,6 +8,15 @@ function numberParser(key) {
   }
 }
 
+function numberOrBoolParser(key) {
+  return function(opt) {
+    if (typeof opt === 'boolean') {
+      return opt;
+    }
+    return numberParser(key)(opt);
+  }
+}
+
 function objectParser(opt) {
   if (typeof opt == 'object') {
     return opt;
@@ -229,6 +238,6 @@ export default {
   },
   "cluster": {
     help: "Run with cluster, optionally set the number of processes default to os.cpus().length",
-    action: numberParser("cluster"),
+    action: numberOrBoolParser("cluster")
   }
 };