Issue2 diminuir erro

Updating master with the "issue_2_diminuir_erro" branch