Updates to README.md and composer.json
Merge branch 'develop'
Merge branch 'master' into develop