Committing exercise 3.16.
Merge origin/master