Update composer.json
Merge pull request #613 from merk/composer-update

Update composer.json