Committing exercise 17.
Merge origin/master