bzhxx Merge pull request #19 from ducalex/win-fix