Updated compilation of cxx branch on Windows.
Merge pull request #58 from fancycode/cxx_win32_fixes

C++ win32 fixes