diff --git a/README.md b/README.md
index 7b283314d90b826d5c0f637e002b575a5b6bee92..fbf210976cb081c6554cb7f475a1ece7ed552956 100644
--- a/README.md
+++ b/README.md
@@ -452,7 +452,7 @@ For testing purposes we will run 2 local production nodes talking to each other.
 ```commandline
 cd ~/eos/build
 cp ../genesis.json ./
-./programs/launcher/launcher -p2 -s testnet.json -l local
+./programs/launcher/launcher -p2 -s testnet.json --skip-signature -l local
 ```
 
 This command will generate 2 data folder for each instance of the node: `tn_data_0` and `tn_data_1`, as well as `testnet.json` file for the testnet configuration.
diff --git a/programs/launcher/main.cpp b/programs/launcher/main.cpp
index a4901bba2d5867511aa91bb499771027824771d8..556f56dc9627404f79601dff0d5d2f52ad8f7c48 100644
--- a/programs/launcher/main.cpp
+++ b/programs/launcher/main.cpp
@@ -236,7 +236,7 @@ launcher_def::set_options (bpo::options_description &cli) {
     ("shape,s",bpo::value<string>()->default_value("ring"),"network topology, use \"ring\" \"star\" \"mesh\" or give a filename for custom")
     ("genesis,g",bpo::value<bf::path>()->default_value("./genesis.json"),"set the path to genesis.json")
     ("output,o",bpo::value<bf::path>(),"save a copy of the generated topology in this file")
-    ("skip-signature,s", bpo::value<bool>(), "EOSD does not require transaction signatures.");
+    ("skip-signature", bpo::bool_switch()->default_value(false), "EOSD does not require transaction signatures.");
 }
 
 void
@@ -252,7 +252,7 @@ launcher_def::initialize (const variables_map &vmap) {
   if (vmap.count("output"))
     output = vmap["output"].as<bf::path>();
   if (vmap.count("skip-signature"))
-    skip_transaction_signatures = true;
+    skip_transaction_signatures = vmap["skip-signature"].as<bool>();
 
   producers = 21;
   data_dir_base = "tn_data_";
diff --git a/testnet.md b/testnet.md
index c9220bd8e4c46e802e0ae10a7c753a43ea66db78..cd676f47bdb8527d19d805b701424feffe71f645 100644
--- a/testnet.md
+++ b/testnet.md
@@ -72,7 +72,9 @@ Testnet launcher options:
                                         set the path to genesis.json
   -o [ --output ] arg                   save a copy of the generated topology 
                                         in this file
-  -i [ --timestamp ] arg                set the timestamp for the first block. 
+  --skip-signature                      EOSD does not require transaction 
+                                        signatures.
+   -i [ --timestamp ] arg                set the timestamp for the first block. 
                                         Use "now" to indicate the current time
   -l [ --launch ] arg                   select a subset of nodes to launch. 
                                         Currently may be "all", "none", or