Merge pull request #267 from Jopie64/development Fix compilation error in MSVC when compiling for c++