Merge pull request #2 from VoiDeD/win-build-improvements

Windows build improvements