Karl's commit
Merge pull request #5 from KarlParkinson/master

Karl's commit