Changes up through Ch. 10
Merge pull request #27 from nobozo/master

Changes through Ch. 10