minor changes for WIN32
Merge remote-tracking branch 'origin/master'