Minor tweaks
Merge pull request #152 from GrahamCampbell/tweaks

Minor Tweaks