Fix all the things!
Merge pull request #68 from Vexatos/patch-2

Fix all the things!