Win32 build updated