Note to 'self: only merge pull requests after a good night sleep, and not just before. :p
Merge pull request #31 from zepag/master

Early morning stupid Fix