Committing exercise 1.21.
Merge origin/master