Complete Chapter 02
Merge branch 'chapter02'