Scenario updates
Merge pull request #129 from remear/scenarios

Scenario updates