Tweaks
Merge pull request #2 from GrahamCampbell/master

Minor Tweaks