Committing exercise 7.
Merge origin/master