Arreglo mas cosas
Merge branch 'rama_alberto'

mergeo alberto