Merge pull request #735 from pcercuei/fix-win32-build-part-2