Minor improvements
Merge pull request #1 from GrahamCampbell/composer

Minor improvements