Completed Exercise 8.5.1
Completed Exercise 8.5.2
Merge branch 'exercises8'