npm stuff
Merge pull request #1 from monteslu/master

npm stuff