Win32 support updated