Completed Chapter 8: Exercise 4
Merge branch 'master' into gh-pages