Corregir el bug de Cristina
Merge branch 'release-1' into develop