Fixes to chapter 6
Fix my fix
Merge pull request #20 from abliss/master

Fixes to chapter 6