Merge pull request #56 from m6w6/Fix-3-0-1-Windows-build