stuff
Merge pull request #2 from PeterDowdy/master

stuff