Merge pull request #1 from padolsey/master

sync back to master
bumped version number
Merge pull request #3 from ibrokethat/npm-version-bump

Npm version bump