Updated from previous chapter (PR #16 and #17)
fix CS
Merge pull request #18 from vicb/patch-4

Updated from previous chapter (PR #16 and #17)