Fix for npm
Merge branch 'hotfix/npmfix'