Updated to Win32 branch