Episodes 57 and 58
Merge pull request #2 from jschlick/master

Episodes 57 and 58