Composer fixes
Merge pull request #7 from GrahamCampbell/develop

Composer Fixes