Merge pull request #3 from MarkyC/master

Merge into Rob