added scenarios
Merge branch 'dev'