Merge pull request #1 from Buzatto/master

Chapter 3 post Bruno
Merge pull request #1 from thomased/master

Merge pull request #1 from Buzatto/master