Merge pull request #49 from Memphiz/win32fix4