latest changes for chapter 2
Merge branch 'master' of https://github.com/jrodenbostel/node-stuff