Merge branch 'chapter04'

I'm lost to whether these modifications are in or not. So please forgive me if this is a duplication.