Merge pull request #36 from Memphiz/win32fix2