What an ass.
Merge pull request #17 from Currfyg/master

Merge