Merge pull request #47 from Memphiz/win32fix3