Salvar Vistoria
Merge branch 'ivan'