Updated windows-build branch