ask refactoring and testing
Merge branch 'master' of github.com:zencoder/zenflow