Composer improvements
Merge pull request #157 from GrahamCampbell/composer

Composer Improvements