Committing exercise 13.
Merge origin/master