added support for tag setup
Merge branch 'master' of github.com:Colingo/scenario