Update Windows - merge master/working
Update Windows