Porting to Win32
Merge remote-tracking branch 'origin/master'
Ported to windows