Update composer.json
Merge pull request #2 from u-labs/master

Merge pull request #1 from u-labs/develop
Update composer.json
Merge pull request #3 from u-labs/develop

merging