diff --git a/bin/node-dev b/bin/node-dev
index 6cbf118..eaa1c13 100755
--- a/bin/node-dev
+++ b/bin/node-dev
@@ -1,10 +1,25 @@
 #!/usr/bin/env node
+
 var dev = require('..')
-  , args = process.argv.slice(2)
+var program = require('commander')
+var resolveMain = require('../lib/resolveMain')
+
+
+program
+  .version(require('../package.json').version)
+  .option('--all-deps', 'watch the whole dependency tree')
+  .option('--no-deps', 'watch only the project’s own files and linked modules' +
+    ' (via `npm link`)')
+  .option('--dedupe', 'dedupe modules dynamically')
+  .arguments('<script> [arguments...]')
+  .action(function (script, scriptArgs) {
+    var wrapper = resolveMain(__dirname + '/../lib/wrap.js')
 
-if (!args.length) {
-  console.log('Usage: node-dev [options] script [arguments]\n')
-  process.exit(1)
-}
+    dev(wrapper, script, scriptArgs || [], {
+      allDeps: program.allDeps || false,
+      noDeps: program.noDeps || false,
+      dedupe: program.dedupe || false,
+    })
+  })
 
-dev(args)
+program.parse(process.argv)
diff --git a/lib/cli.js b/lib/cli.js
deleted file mode 100644
index 4c76466..0000000
--- a/lib/cli.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var resolve = require('resolve').sync
-
-/**
- * Look for an argument with the given name and remove it if found.
- * Returns `true` if the argument is found, `false` otherwise.
- */
-function option(args, name) {
-  var i = args.indexOf(name)
-  if (~i) {
-    args.splice(i, 1)
-    return true
-  }
-  return false
-}
-
-exports.parseOpts = function(args) {
-  return {
-    allDeps: option(args, '--all-deps'),
-    noDeps: option(args, '--no-deps'),
-    dedupe: option(args, '--dedupe')
-  }
-}
-
-exports.injectScript = function(args, script) {
-  // Find the first arg that is not an option
-  for (var i=0; i < args.length; i++) {
-    if (!/^-/.test(args[i])) {
-      // Splice script into the argument list
-      args.splice(i, 0, script)
-      return exports.resolveMain(args[i+1])
-    }
-  }
-}
-
-exports.resolveMain = function(main) {
-  return resolve(main, {
-    basedir: process.cwd(),
-    paths: [process.cwd()]
-  })
-}
diff --git a/lib/index.js b/lib/index.js
index ca8d0fa..3043d37 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,19 +2,26 @@ var fork = require('child_process').fork
 var path = require('path')
 var filewatcher = require('filewatcher')
 var ipc = require('./ipc')
-var cli = require('./cli')
+var resolveMain = require('./resolveMain')
 
-module.exports = function(args) {
 
-  // The child_process
-  var child
+module.exports = function(wrapper, script, scriptArgs, opts) {
+  if (typeof wrapper !== 'string' || wrapper.length === 0) {
+    throw new TypeError('`wrapper` must be a string')
+  }
+
+  if (typeof script !== 'string' || script.length === 0) {
+    throw new TypeError('`script` must be a string')
+  }
 
-  // Parse command line options
-  var opts = cli.parseOpts(args)
+  if (!Array.isArray(scriptArgs)) {
+    throw new TypeError('`scriptArgs` must be an array')
+  }
 
-  // Inject wrap.js into the args array
-  var main = cli.injectScript(args, __dirname + '/wrap.js')
+  // The child_process
+  var child
 
+  var main = resolveMain(script)
   var cfg = require('./cfg')(main, opts)
   var log = require('./log')(cfg)
   var notify = require('./notify')(cfg, log)
@@ -50,7 +57,8 @@ module.exports = function(args) {
    * Run the wrapped script.
    */
   function start() {
-    child = fork(args[0], args.slice(1), {
+    var wrapperArgs = [script].concat(scriptArgs)
+    child = fork(wrapper, wrapperArgs, {
       cwd: process.cwd(),
       env: process.env
     })
diff --git a/lib/resolveMain.js b/lib/resolveMain.js
new file mode 100644
index 0000000..9234f59
--- /dev/null
+++ b/lib/resolveMain.js
@@ -0,0 +1,9 @@
+var resolve = require('resolve').sync
+
+
+module.exports = function(main) {
+  return resolve(main, {
+    basedir: process.cwd(),
+    paths: [process.cwd()]
+  })
+}
diff --git a/lib/wrap.js b/lib/wrap.js
index 9bb396f..bdfaf94 100755
--- a/lib/wrap.js
+++ b/lib/wrap.js
@@ -5,13 +5,13 @@ var resolve = require('resolve').sync
 var hook = require('./hook')
 var ipc = require('./ipc')
 var cfg = require('./cfg')
-var cli = require('./cli')
+var resolveMain = require('./resolveMain')
 
 // Remove wrap.js from the argv array
 process.argv.splice(1, 1)
 
 // Resolve the location of the main script relative to cwd
-var main = cli.resolveMain(process.argv[1])
+var main = resolveMain(process.argv[1])
 
 var cfg = require('./cfg')(main)
 
diff --git a/package.json b/package.json
index ed7d30b..0dba833 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "test": "node test"
   },
   "dependencies": {
+    "commander": "^2.8.1",
     "dateformat": "~1.0.4-1.2.3",
     "dynamic-dedupe": "^0.2.0",
     "filewatcher": "~1.1.1",