Merge pull request #4 from chrisb1510/master

merging for tidyup, got confusing