Merge branch 'hotfix/v1.0.1'
Update composer
Merge branch 'master' into develop