Update package.json and CHANGELOG.md
Merge branch 'develop'