Win32 support added