win32 fixes
Merge pull request #142 from jddurand/master

win32 fixes