chapter 6 exercises
Merge branch 'release/v0.6.1' into develop