Merge pull request #3 from MarkyC/master

Merge into Rob
Merge pull request #5 from MarkyC/Rob

Merge pull request #3 from MarkyC/master