Adding chapter 2 code
Merge remote-tracking branch 'master/master'