Small improvements to Chapter 7
Merge pull request #218 from rylev/ch7-changes

Small improvements to Chapter 7