Merge pull request #4 from archaeogeek/master

Merging master
Merge pull request #2 from osgeouk/master

Merge pull request