Minor tweaks
Merge pull request #241 from GrahamCampbell:master

Minor tweaks