Updated exercises
Merge branch 'martijn'