Merge pull request #140 from salvadorcortes/master

Ultimos cambios merge
Merge remote-tracking branch 'upstream/master'