Merge branch 'hotfix/0.1.5'
Update package.json
Merge branch 'hotfix/0.1.6' into develop