C++ version is also compilable with GCC 4.6
Merge pull request #12 from tkalbitz/upstream-gcc

C++ version is also compilable with GCC 4.6