Update to merge from the master repo for proofreading chap11