Submission from @richgilbank
Merge pull request #126 from richgilbank/master

Submission from @richgilbank