Fix win requirements
Merge branch 'dev'