Merge pull request #2 from apache/windows-build-fix