Merge pull request #22 from Memphiz/win32compilefix