cancelata bugs corrigidos
Merge branch 'andre'