Fix Windows build
Fix CI link
Merge remote-tracking branch 'sabel83/master'