resolves #964
Merge pull request #1449 from jonschlinkert/master

resolves #964