Minor tweaks
Merge pull request #5 from GrahamCampbell/master

Minor Tweaks