Changes up through Ch 9.
Merge pull request #26 from nobozo/master

Changes though Ch. 09