Merge pull request #30 from rockamorales/master

Modificaciones
Merge pull request #138 from mackk/master

mod