Tweaks
Merge pull request #1 from GrahamCampbell/master

Minor Tweaks