Merging November 2 submission into master