windows stabilyty
Merge branch 'windows'