Merge branch 'hotfix/0.1.13'
Fix composer.json
Merge branch 'hotfix/0.1.14' into develop