Committing exercise 2.8.
Merge origin/master