Merge branch 'chapter4'