Merge pull request #34 from Memphiz/win32fix2