smarter execution flow
Merge pull request #26 from fwbrasil/new-execution-flow

smarter execution flow