Merge pull request #3 from djordje/master

Composer support