Committing exercise 5 from chapter 2.
Merge origin/master