Merge pull request #539 from kugel-/win32-fix