Tweaks
Merge pull request #4 from GrahamCampbell/master

Tweaks And Improvements merged in, cheers.