Merge branch 'release/0.2.1' into develop
Update package.json
Merge branch 'develop'