errores menores
Merge origin/master