Trying to make this a bit neater...
Merge pull request #37 from GregoriusMC/patch-4

Trying to make this a bit neater...