Merge pull request #2 from MikeSnow/master

Merge pull request #1 from MikeSnow/RevsionMiki
Merge pull request #1 from MikeSnow/RevsionMiki

Merge pull request #2 from MikeSnow/master
Merge pull request #2 from ThaisM/PruebaThais

Prueba thais