Fixes for win32 platform
Merge pull request #88 from devmission/master

Fixes for win32 platform