diff --git a/lib/tokenize-arg-string.js b/lib/tokenize-arg-string.js
index 70154425..6c8d23ef 100644
--- a/lib/tokenize-arg-string.js
+++ b/lib/tokenize-arg-string.js
@@ -2,6 +2,8 @@
 module.exports = function (argString) {
   if (Array.isArray(argString)) return argString
 
+  argString = argString.trim()
+
   var i = 0
   var prevC = null
   var c = null
diff --git a/test/tokenize-arg-string.js b/test/tokenize-arg-string.js
index 63ad2954..2f7cffcc 100644
--- a/test/tokenize-arg-string.js
+++ b/test/tokenize-arg-string.js
@@ -39,8 +39,10 @@ describe('TokenizeArgString', function () {
     args[2].should.equal('--bar=foo "bar"')
   })
 
-  it('multiple spaces only counted in quotes', function () {
-    var args = tokenizeArgString('foo  bar  "foo  bar"')
+  // https://github.com/yargs/yargs-parser/pull/100
+  // https://github.com/yargs/yargs-parser/pull/106
+  it('ignores unneeded spaces', function () {
+    var args = tokenizeArgString('  foo  bar  "foo  bar"  ')
     args[0].should.equal('foo')
     expect(args[1]).equal('bar')
     expect(args[2]).equal('foo  bar')