Changes from Pete
Merge pull request #2 from davidblurton/master

Changes from Pete