Finished chapter6
Merge branch 'dev'