Finish 8.4
Merge branch 'chapter8'