composer
Merge pull request #3 from paction/master

composer changes