Partial Bugfix-controle de fluxo
merge