diff --git a/lib/cmds/opts.ts b/lib/cmds/opts.ts
index 890e7698..64668e00 100644
--- a/lib/cmds/opts.ts
+++ b/lib/cmds/opts.ts
@@ -13,6 +13,7 @@ export const STANDALONE = 'standalone';
 export const CHROME = 'chrome';
 export const IE = 'ie';
 export const IE32 = 'ie32';
+export const EDGE = 'edge';
 export const ANDROID = 'android';
 export const VERSIONS_CHROME = 'versions.chrome';
 export const VERSIONS_STANDALONE = 'versions.standalone';
@@ -40,6 +41,7 @@ opts[STANDALONE] = new Option(STANDALONE, 'Install or update selenium standalone
 opts[CHROME] = new Option(CHROME, 'Install or update chromedriver', 'boolean', ChromeDriver.isDefault);
 opts[IE] = new Option(IE, 'Install or update ie driver', 'boolean', IEDriver.isDefault);
 opts[IE32] = new Option(IE32, 'Install or update 32-bit ie driver', 'boolean', IEDriver.isDefault);
+opts[EDGE] = new Option(EDGE, 'Use installed Microsoft Edge driver', 'string', 'C:\\Program Files (x86)\\Microsoft Web Driver\\MicrosoftWebDriver.exe');
 opts[ANDROID] = new Option(ANDROID, 'Update/use the android sdk', 'boolean', AndroidSDK.isDefault);
 opts[VERSIONS_CHROME] = new Option(VERSIONS_CHROME, 'Optional chrome driver version', 'string', ChromeDriver.versionDefault);
 opts[VERSIONS_ANDROID] = new Option(VERSIONS_ANDROID, 'Optional android sdk version', 'string', AndroidSDK.versionDefault);
diff --git a/lib/cmds/start.ts b/lib/cmds/start.ts
index 602f499b..c7ebe455 100644
--- a/lib/cmds/start.ts
+++ b/lib/cmds/start.ts
@@ -30,6 +30,7 @@ let prog = new Program()
 
 if (os.type() === 'Windows_NT') {
   prog.addOption(Opts[Opt.VERSIONS_IE]);
+  prog.addOption(Opts[Opt.EDGE]);
 }
 
 export var program = prog;
@@ -107,6 +108,11 @@ function start(options: Options) {
         '-Dwebdriver.ie.driver=' +
         path.join(outputDir, binaries[IEDriver.id].executableFilename(osType)));
   }
+  if (options[Opt.EDGE]) {
+    args.push(
+        '-Dwebdriver.edge.driver=' +
+        options[Opt.EDGE].getString());
+  }
   if (options[Opt.ANDROID].getBoolean()) {
     if (downloadedBinaries[AndroidSDK.id] != null) {
       let avds = options[Opt.AVDS].getString();