Composer fixes
Merge pull request #17 from GrahamCampbell/patch-2

Composer Fixes