Merge branch 'hotfix/0.1.1'
Merge branch 'release/0.1.2'
small fix in package.json
Merge branch 'hotfix/0.1.3' into develop