Merge pull request #143 from TheOneRing/windows-ci