tarefa 2440, outra 2324
Merge branch 'andre'