Windows build

TBR - move commit from already merged windows-build branch