Fixing my broken fix, let's hope it's fixed.
Merge pull request #12 from jcrza/patch-2

Fixing my broken fix, let's hope it's fixed.