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