will the real chapter 2 please stand up?
Merge branch 'chapter2'