Committing exercise 1.10.
Merge origin/master