Episode 76 Fixes #34
Merge remote-tracking branch 'upstream/master'