windows fix
Merge remote-tracking branch 'mach/master'