Peter's code
Merge pull request #38 from conclarke/master

Peter's code