Merge pull request #187 from kwilcox/master

Theme 1 - Scenarios D and E