Merge pull request #1 from u-labs/develop

UPD: append composer.json
Merge pull request #2 from u-labs/master

Merge pull request #1 from u-labs/develop