Minor improvements
Merge pull request #3 from GrahamCampbell/composer

Minor improvements