Composer fixes
Merge pull request #74 from GrahamCampbell/composer

Composer Fixes