Update composer.json
Merge branch 'master' into issue-14