Committing exercise 6.5.
Merge origin/master