Merge pull request #1 from Xanza/master

Added composer support
Merge pull request #2 from Xanza/dev

Merge pull request #1 from Xanza/master