tidied up
Merge pull request #2 from mstoye/origin/master

tidied up