Merge pull request #1 from sokool/master

composer.json set up
Merge pull request #2 from sokool/development

Merge pull request #1 from sokool/master