Switch to composer version of tools
Merge with master
Merge pull request #10 from wagnert/master

Merge with master