Updating for Windows build

linux,osx,windows up-to-date