Exercises 3.6 and 3.7
Merge pull request #519 from marcbezem/master

Exercises 3.6 and 3.7