Minor improvements
Merge pull request #2 from GrahamCampbell/composer

Minor improvements