npm fixes
Merge pull request #109 from kurunt/dev

npm fixes