Fix compilation on gcc 4.8.2

Hey,

Thanks a lot for the library. In order to get it to compile on gcc 4.8.2 I had to change those files.

Nick