ultimos cambios

ultimos cambios
Merge pull request #157 from salvadorcortes/master

ultimos cambios