Fix customer scenarios
Merge pull request #13 from remear/scenarios

Fix customer scenarios