and there comes the mandatory 1.8 compat fix
Merge pull request #20 from rottenbytes/fixes

and there comes the mandatory 1.8 compat fix