diff --git a/.gitignore b/.gitignore
index a470d21..9addf7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ selenium-standalone
 _build
 build_doc
 _publish
+*.tgz
diff --git a/docs/api.json b/docs/api.json
index b092fb6..a89ac24 100644
--- a/docs/api.json
+++ b/docs/api.json
@@ -11226,7 +11226,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 341,
+									"line": 345,
 									"character": 17
 								}
 							],
@@ -11247,7 +11247,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 338,
+									"line": 342,
 									"character": 5
 								}
 							],
@@ -11272,7 +11272,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 339,
+									"line": 343,
 									"character": 8
 								}
 							],
@@ -11297,7 +11297,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 340,
+									"line": 344,
 									"character": 9
 								}
 							],
@@ -11322,7 +11322,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 341,
+									"line": 345,
 									"character": 8
 								}
 							],
@@ -11362,7 +11362,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 357,
+									"line": 361,
 									"character": 13
 								}
 							]
@@ -11407,7 +11407,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 377,
+									"line": 381,
 									"character": 15
 								}
 							],
@@ -11453,7 +11453,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 381,
+									"line": 385,
 									"character": 21
 								}
 							],
@@ -11499,7 +11499,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 373,
+									"line": 377,
 									"character": 8
 								}
 							],
@@ -11547,7 +11547,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 336,
+							"line": 340,
 							"character": 18
 						}
 					],
@@ -11640,7 +11640,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 317,
+									"line": 321,
 									"character": 26
 								}
 							]
@@ -11656,7 +11656,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 322,
+									"line": 326,
 									"character": 29
 								}
 							],
@@ -11677,7 +11677,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 324,
+									"line": 328,
 									"character": 35
 								}
 							],
@@ -11706,7 +11706,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 323,
+									"line": 327,
 									"character": 22
 								}
 							],
@@ -11737,7 +11737,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 317,
+							"line": 321,
 							"character": 21
 						}
 					],
@@ -11816,7 +11816,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 400,
+									"line": 404,
 									"character": 17
 								}
 							],
@@ -11837,7 +11837,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 397,
+									"line": 401,
 									"character": 5
 								}
 							],
@@ -11862,7 +11862,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 398,
+									"line": 402,
 									"character": 8
 								}
 							],
@@ -11887,7 +11887,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 399,
+									"line": 403,
 									"character": 9
 								}
 							],
@@ -11912,7 +11912,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 400,
+									"line": 404,
 									"character": 8
 								}
 							],
@@ -11952,7 +11952,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 417,
+									"line": 421,
 									"character": 13
 								}
 							]
@@ -11997,7 +11997,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 439,
+									"line": 443,
 									"character": 15
 								}
 							],
@@ -12043,7 +12043,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 443,
+									"line": 447,
 									"character": 21
 								}
 							],
@@ -12089,7 +12089,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 435,
+									"line": 439,
 									"character": 8
 								}
 							],
@@ -12137,7 +12137,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 395,
+							"line": 399,
 							"character": 19
 						}
 					],
@@ -12225,7 +12225,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 460,
+									"line": 464,
 									"character": 17
 								}
 							],
@@ -12246,7 +12246,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 458,
+									"line": 462,
 									"character": 5
 								}
 							],
@@ -12271,7 +12271,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 459,
+									"line": 463,
 									"character": 8
 								}
 							],
@@ -12296,7 +12296,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 460,
+									"line": 464,
 									"character": 8
 								}
 							],
@@ -12336,7 +12336,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 475,
+									"line": 479,
 									"character": 13
 								}
 							]
@@ -12372,7 +12372,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 493,
+									"line": 497,
 									"character": 15
 								}
 							],
@@ -12418,7 +12418,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 497,
+									"line": 501,
 									"character": 21
 								}
 							],
@@ -12464,7 +12464,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 480,
+									"line": 484,
 									"character": 8
 								}
 							],
@@ -12511,7 +12511,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 457,
+							"line": 461,
 							"character": 14
 						}
 					],
@@ -12606,7 +12606,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 84,
+									"line": 85,
 									"character": 25
 								}
 							],
@@ -12976,7 +12976,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 70,
+									"line": 71,
 									"character": 8
 								}
 							],
@@ -13012,7 +13012,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 63,
+									"line": 64,
 									"character": 8
 								}
 							],
@@ -13278,7 +13278,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 31,
+									"line": 32,
 									"character": 13
 								}
 							],
@@ -13316,7 +13316,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 84,
+									"line": 85,
 									"character": 16
 								}
 							],
@@ -13453,7 +13453,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 77,
+									"line": 78,
 									"character": 8
 								}
 							],
@@ -13520,7 +13520,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 101,
+									"line": 102,
 									"character": 13
 								}
 							]
@@ -13605,7 +13605,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 105,
+									"line": 106,
 									"character": 14
 								}
 							],
@@ -13652,7 +13652,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 109,
+									"line": 110,
 									"character": 15
 								}
 							],
@@ -13747,7 +13747,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 113,
+									"line": 114,
 									"character": 17
 								}
 							],
@@ -13933,7 +13933,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 123,
+									"line": 124,
 									"character": 8
 								}
 							],
@@ -14072,7 +14072,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 179,
+									"line": 180,
 									"character": 28
 								}
 							]
@@ -14113,7 +14113,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 202,
+									"line": 203,
 									"character": 20
 								}
 							],
@@ -14451,7 +14451,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 232,
+									"line": 236,
 									"character": 28
 								}
 							],
@@ -14516,7 +14516,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 243,
+									"line": 247,
 									"character": 17
 								}
 							],
@@ -14634,7 +14634,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 136,
+									"line": 137,
 									"character": 9
 								}
 							],
@@ -14739,7 +14739,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 174,
+									"line": 175,
 									"character": 13
 								}
 							],
@@ -14939,7 +14939,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 28,
+							"line": 29,
 							"character": 35
 						}
 					],
@@ -14987,7 +14987,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 328,
+									"line": 332,
 									"character": 5
 								}
 							],
@@ -15007,7 +15007,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 329,
+									"line": 333,
 									"character": 8
 								}
 							],
@@ -15027,7 +15027,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 330,
+									"line": 334,
 									"character": 9
 								}
 							],
@@ -15047,7 +15047,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 331,
+									"line": 335,
 									"character": 8
 								}
 							],
@@ -15072,7 +15072,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 327,
+							"line": 331,
 							"character": 26
 						}
 					],
@@ -15107,7 +15107,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 289,
+									"line": 293,
 									"character": 12
 								}
 							],
@@ -15146,7 +15146,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 290,
+									"line": 294,
 									"character": 11
 								}
 							],
@@ -15172,7 +15172,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 285,
+									"line": 289,
 									"character": 17
 								}
 							],
@@ -15193,7 +15193,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 291,
+									"line": 295,
 									"character": 4
 								}
 							],
@@ -15223,7 +15223,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 284,
+							"line": 288,
 							"character": 27
 						}
 					],
@@ -15272,7 +15272,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 387,
+									"line": 391,
 									"character": 5
 								}
 							],
@@ -15292,7 +15292,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 388,
+									"line": 392,
 									"character": 8
 								}
 							],
@@ -15312,7 +15312,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 389,
+									"line": 393,
 									"character": 9
 								}
 							],
@@ -15332,7 +15332,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 390,
+									"line": 394,
 									"character": 8
 								}
 							],
@@ -15357,7 +15357,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 386,
+							"line": 390,
 							"character": 27
 						}
 					],
@@ -15389,7 +15389,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 450,
+									"line": 454,
 									"character": 5
 								}
 							],
@@ -15409,7 +15409,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 451,
+									"line": 455,
 									"character": 8
 								}
 							],
@@ -15429,7 +15429,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 452,
+									"line": 456,
 									"character": 8
 								}
 							],
@@ -15453,7 +15453,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 449,
+							"line": 453,
 							"character": 22
 						}
 					],
@@ -15488,7 +15488,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 289,
+									"line": 293,
 									"character": 12
 								}
 							],
@@ -15522,7 +15522,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 290,
+									"line": 294,
 									"character": 11
 								}
 							],
@@ -15543,7 +15543,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 291,
+									"line": 295,
 									"character": 4
 								}
 							],
@@ -15567,7 +15567,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 288,
+							"line": 292,
 							"character": 27
 						}
 					],
@@ -15628,7 +15628,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 312,
+									"line": 316,
 									"character": 11
 								}
 							],
@@ -15714,7 +15714,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 311,
+							"line": 315,
 							"character": 40
 						}
 					],
@@ -15826,7 +15826,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 304,
+									"line": 308,
 									"character": 8
 								}
 							],
@@ -15873,7 +15873,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 303,
+									"line": 307,
 									"character": 8
 								}
 							],
@@ -16080,7 +16080,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 302,
+									"line": 306,
 									"character": 13
 								}
 							],
@@ -16104,7 +16104,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 306,
+									"line": 310,
 									"character": 16
 								}
 							],
@@ -16229,7 +16229,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 305,
+									"line": 309,
 									"character": 8
 								}
 							],
@@ -16270,7 +16270,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 301,
+							"line": 305,
 							"character": 35
 						}
 					],
@@ -16300,7 +16300,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 334,
+							"line": 338,
 							"character": 18
 						}
 					],
@@ -16327,7 +16327,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 315,
+							"line": 319,
 							"character": 22
 						}
 					],
@@ -16385,7 +16385,7 @@
 									"sources": [
 										{
 											"fileName": "SeleniumTunnel.ts",
-											"line": 315,
+											"line": 319,
 											"character": 26
 										}
 									]
@@ -16403,7 +16403,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 315,
+									"line": 319,
 									"character": 24
 								}
 							]
@@ -16422,7 +16422,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 294,
+							"line": 298,
 							"character": 28
 						}
 					],
@@ -16468,7 +16468,7 @@
 											"sources": [
 												{
 													"fileName": "SeleniumTunnel.ts",
-													"line": 299,
+													"line": 303,
 													"character": 9
 												}
 											],
@@ -16489,7 +16489,7 @@
 											"sources": [
 												{
 													"fileName": "SeleniumTunnel.ts",
-													"line": 299,
+													"line": 303,
 													"character": 26
 												}
 											],
@@ -16521,7 +16521,7 @@
 									"sources": [
 										{
 											"fileName": "SeleniumTunnel.ts",
-											"line": 299,
+											"line": 303,
 											"character": 2
 										}
 									]
@@ -16541,7 +16541,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 393,
+							"line": 397,
 							"character": 19
 						}
 					],
@@ -16568,7 +16568,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 455,
+							"line": 459,
 							"character": 14
 						}
 					],
@@ -16596,7 +16596,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 309,
+							"line": 313,
 							"character": 27
 						}
 					],
@@ -16623,7 +16623,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 14,
+							"line": 15,
 							"character": 19
 						}
 					],
@@ -16644,7 +16644,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 15,
+							"line": 16,
 							"character": 20
 						}
 					],
@@ -16665,7 +16665,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 16,
+							"line": 17,
 							"character": 15
 						}
 					],
@@ -16686,7 +16686,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 13,
+							"line": 14,
 							"character": 21
 						}
 					],
@@ -16716,7 +16716,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 503,
+									"line": 507,
 									"character": 7
 								}
 							],
@@ -16738,7 +16738,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 504,
+									"line": 508,
 									"character": 8
 								}
 							],
@@ -16760,7 +16760,7 @@
 							"sources": [
 								{
 									"fileName": "SeleniumTunnel.ts",
-									"line": 505,
+									"line": 509,
 									"character": 3
 								}
 							],
@@ -16786,7 +16786,7 @@
 					"sources": [
 						{
 							"fileName": "SeleniumTunnel.ts",
-							"line": 502,
+							"line": 506,
 							"character": 19
 						}
 					],
diff --git a/package-lock.json b/package-lock.json
index f4a4a0c..c5245ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,9 +31,9 @@
       "integrity": "sha1-TUjz2MMmxF5k3TRq+tAK61gmPZo="
     },
     "@theintern/dev": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@theintern/dev/-/dev-0.5.6.tgz",
-      "integrity": "sha512-utfM6sBOxDhxfYZsgK08m55gSmj82l/PYyBEwyS1ecB/nCHe/F6AqPwpNFSFG8W82cNNBcAN4GQv/AaQwXxAKA==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@theintern/dev/-/dev-0.5.10.tgz",
+      "integrity": "sha512-tsogzvC4ivPMGu/q6l4vF9M1PuaSiA0QBG6sCrJnBZnQyEAt4oDE5+msKaLLtR5ehVqeiM+zKCaE6ioYvfldrw==",
       "dev": true,
       "requires": {
         "chalk": "2.1.0",
@@ -43,7 +43,7 @@
         "shelljs": "0.7.8",
         "tslint": "5.7.0",
         "typedoc": "0.8.0",
-        "typescript": "2.4.2"
+        "typescript": "2.5.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -136,9 +136,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.74",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.74.tgz",
-      "integrity": "sha512-BZknw3E/z3JmCLqQVANcR17okqVTPZdlxvcIz0fJiJVLUCbSH1hK3zs9r634PVSmrzAxN+n/fxlVRiYoArdOIQ==",
+      "version": "4.14.76",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.76.tgz",
+      "integrity": "sha512-D9fps/hN+XLF7G6SprwfxSxT3SFpKF3qix5IUx41AxwI9Zrdv+3Gqn1gprb3/O/+x6lpT9STJEZib6sogddPpA==",
       "dev": true
     },
     "@types/marked": {
@@ -159,6 +159,12 @@
       "integrity": "sha512-F+qaJi0iw9Yk7Ugml+HtTi2r399gPEFfKh2lwr86/a/5LVHODiAllBlNCNrgo5sT9WRHl74ryEbXVeNUN3ToCQ==",
       "dev": true
     },
+    "@types/semver": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.4.0.tgz",
+      "integrity": "sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig==",
+      "dev": true
+    },
     "@types/shelljs": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.7.1.tgz",
@@ -1145,13 +1151,13 @@
       }
     },
     "fs-extra": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz",
-      "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
+        "jsonfile": "4.0.0",
         "universalify": "0.1.1"
       }
     },
@@ -2521,9 +2527,9 @@
       }
     },
     "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11"
@@ -3048,8 +3054,7 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-      "dev": true
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -3280,7 +3285,7 @@
         "resolve": "1.4.0",
         "semver": "5.4.1",
         "tslib": "1.7.1",
-        "tsutils": "2.8.2"
+        "tsutils": "2.11.1"
       },
       "dependencies": {
         "commander": {
@@ -3321,9 +3326,9 @@
       }
     },
     "tsutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz",
-      "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=",
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.11.1.tgz",
+      "integrity": "sha1-ED3/P6UIr/VknBbcTm3UXcQdvGI=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
@@ -3359,11 +3364,11 @@
         "@types/fs-extra": "4.0.2",
         "@types/handlebars": "4.0.36",
         "@types/highlight.js": "9.1.10",
-        "@types/lodash": "4.14.74",
+        "@types/lodash": "4.14.76",
         "@types/marked": "0.0.28",
         "@types/minimatch": "2.0.29",
         "@types/shelljs": "0.7.1",
-        "fs-extra": "4.0.1",
+        "fs-extra": "4.0.2",
         "handlebars": "4.0.10",
         "highlight.js": "9.12.0",
         "lodash": "4.17.4",
@@ -3390,9 +3395,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
-      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
+      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
       "dev": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index 58e64d0..e607ad2 100644
--- a/package.json
+++ b/package.json
@@ -1,49 +1,56 @@
 {
-  "name": "@theintern/digdug",
-  "version": "2.0.0-pre",
-  "description": "Dig Dug. A simple abstraction library for downloading and launching WebDriver service tunnels.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/theintern/digdug.git"
-  },
-  "license": "BSD-3-Clause",
-  "dependencies": {
-    "@dojo/core": "beta2",
-    "@dojo/has": "beta2",
-    "@dojo/interfaces": "beta2",
-    "@dojo/shim": "beta2",
-    "decompress": "~4.2.0"
-  },
-  "devDependencies": {
-    "@dojo/loader": "beta2",
-    "@theintern/dev": "~0.5.6",
-    "@types/node": "~7.0.23",
-    "@types/shelljs": "~0.7.1",
-    "concurrently": "~3.5.0",
-    "intern": "~3.4.2",
-    "shelljs": "~0.7.7"
-  },
-  "scripts": {
-    "build": "npm run clean && concurrently intern-dev-build intern-dev-api",
-    "ci": "intern-dev-build && intern-dev-test",
-    "clean": "intern-dev-clean",
-    "lint": "intern-dev-lint",
-    "release": "intern-dev-release",
-    "test": "intern-dev-build && intern-dev-test"
-  },
-  "bugs": "https://github.com/theintern/digdug/issues",
-  "keywords": [
-    "javascript",
-    "test",
-    "functional",
-    "selenium",
-    "webdriver",
-    "sauce labs",
-    "browserstack",
-    "testingbot"
-  ],
-  "homepage": "https://github.com/theintern/digdug",
-  "bin": {
-    "digdugEnvironments": "./bin/digdugEnvironments.js"
-  }
-}
\ No newline at end of file
+	"name": "@theintern/digdug",
+	"version": "2.0.0-pre",
+	"description":
+		"Dig Dug. A simple abstraction library for downloading and launching WebDriver service tunnels.",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/theintern/digdug.git"
+	},
+	"license": "BSD-3-Clause",
+	"dependencies": {
+		"@dojo/core": "beta2",
+		"@dojo/has": "beta2",
+		"@dojo/interfaces": "beta2",
+		"@dojo/shim": "beta2",
+		"decompress": "~4.2.0",
+		"semver": "~5.4.1"
+	},
+	"devDependencies": {
+		"@dojo/loader": "beta2",
+		"@theintern/dev": "~0.5.10",
+		"@types/node": "~7.0.23",
+		"@types/semver": "~5.4.0",
+		"@types/shelljs": "~0.7.1",
+		"concurrently": "~3.5.0",
+		"intern": "~3.4.2",
+		"shelljs": "~0.7.7"
+	},
+	"scripts": {
+		"build":
+			"npm run clean && concurrently intern-dev-build intern-dev-api",
+		"ci": "intern-dev-build && intern-dev-test",
+		"clean": "intern-dev-clean",
+		"devpack":
+			"intern-dev-build && cd _build/src && npm pack && mv *.tgz ../../",
+		"lint": "intern-dev-lint",
+		"release": "intern-dev-release",
+		"test": "intern-dev-build && intern-dev-test",
+		"watch": "intern-dev-build watch"
+	},
+	"bugs": "https://github.com/theintern/digdug/issues",
+	"keywords": [
+		"javascript",
+		"test",
+		"functional",
+		"selenium",
+		"webdriver",
+		"sauce labs",
+		"browserstack",
+		"testingbot"
+	],
+	"homepage": "https://github.com/theintern/digdug",
+	"bin": {
+		"digdugEnvironments": "./bin/digdugEnvironments.js"
+	}
+}
diff --git a/src/SeleniumTunnel.ts b/src/SeleniumTunnel.ts
index 7a88dcc..9427438 100644
--- a/src/SeleniumTunnel.ts
+++ b/src/SeleniumTunnel.ts
@@ -9,6 +9,7 @@ import Task from '@dojo/core/async/Task';
 import { fileExists, on, writeFile } from './util';
 import { Handle } from '@dojo/interfaces/core';
 import { mixin } from '@dojo/core/lang';
+import { satisfies } from 'semver';
 
 const SeleniumVersion = '3.4.0';
 const ChromeVersion = '2.30';
@@ -222,7 +223,10 @@ export default class SeleniumTunnel extends Tunnel
 		);
 
 		if (this.verbose) {
-			args.push('-debug', 'true');
+			args.push('-debug');
+			if (satisfies(this.version, '>=3.1.0 <3.5.0')) {
+				args.push('true');
+			}
 			console.log('Starting with arguments: ', args.join(' '));
 		}
 
diff --git a/tests/unit/SeleniumTunnel.ts b/tests/unit/SeleniumTunnel.ts
index f933562..6fd178f 100644
--- a/tests/unit/SeleniumTunnel.ts
+++ b/tests/unit/SeleniumTunnel.ts
@@ -40,6 +40,55 @@ registerSuite({
 				Object.defineProperty(tunnel, 'directory', { value: '.' });
 				tunnel.isDownloaded;
 			}, /Invalid driver/);
-		}
+		},
+
+		'debug args': (function() {
+			function createTest(version: string, hasDebugArg: boolean) {
+				return function() {
+					const tunnel = new SeleniumTunnel({
+						version,
+						verbose: true
+					});
+					console.log = () => {};
+					const args = tunnel['_makeArgs']();
+					console.log = oldLog;
+					const indexOfDebug = args.indexOf('-debug');
+					assert.notEqual(
+						indexOfDebug,
+						-1,
+						'expected -debug arg to be present'
+					);
+					if (hasDebugArg) {
+						assert.equal(
+							args[indexOfDebug + 1],
+							'true',
+							"-debug should have 'true' value"
+						);
+					} else {
+						assert.notEqual(
+							args[indexOfDebug + 1],
+							'true',
+							"-debug should not have 'true' value"
+						);
+					}
+				};
+			}
+
+			let oldLog = console.log;
+
+			return {
+				afterEach() {
+					console.log = oldLog;
+				},
+				'3.0.0': createTest('3.0.0', false),
+				'3.0.1': createTest('3.0.1', false),
+				'3.1.0': createTest('3.1.0', true),
+				'3.2.0': createTest('3.2.2', true),
+				'3.3.0': createTest('3.3.0', true),
+				'3.4.0': createTest('3.4.0', true),
+				'3.4.9': createTest('3.4.9', true),
+				'3.5.0': createTest('3.5.0', false)
+			};
+		})()
 	}
 });