Merge pull request #37 from rockamorales/master

Modificaciones
Merge pull request #79 from mackk/master

last mod