changes for chapter2

reviwed by Jason/Riq over lunch
Merge pull request #44 from ricardoquesada/changes_reviewd_by_jason_riq

changes for chapter2