Committing exercise 3.2, part one.
Merge origin/master