Fixed #4
Merge branch 'develop'
Fixed version in package.json