Adding suport for win32