Composer fixes
Merge pull request #486 from GrahamCampbell/composer

Composer Fixes