Composer improvements
Merge pull request #216 from GrahamCampbell/patch-1

Composer Improvements