Composer fixes
Merge pull request #12 from GrahamCampbell/patch-1

Composer fixes