Finish chapter4
Merge branch 'master' of https://github.com/bay6/prepare