Ajustes
Merge branch 'bruno'