Cambios menores
Merge branch 'master' into testing