Refactoring composer dependencies
Merge pull request #13 from wagnert/master

Refactoring composer dependencies