simple commit that should resolve some issues with gcc 4.9, thanks to
jeaye@freenode for pointing this out