Merge pull request #215 from oberstet/experimental

some Windows build fixes