Updated version for npm.
Merge branch 'develop'