Must recheck this.

Signed-off-by: fabriciocosta <fabricio.costa@moldeointeractive.com.ar>
Merge branch 'fabriciocosta/cleaning_and_testing'