Composer updates
Merge pull request #54 from GrahamCampbell/composer

Composer updates