Sync chap 7 code with most recent chap 6 updates
Merge pull request #112 from chalin/patch-0403-ch7-sync-with-ch6

Sync chap 7 code with most recent chap 6 updates