Minor changes to composer.json, add a tag
Merge origin/master