cancelata bugs checar
Merge branch 'andre'