Updated to build with Mingw GCC on WIN-32