Merge branch 'chapter5'
Removing workaround from old 0.3.1 bug
Merge pull request #20 from AlexBenton/master

Remove old 0.3.1 workaround code