Merge pull request #27 from rockamorales/master

Modificaciones
Merge pull request #133 from mackk/master

mod