Merge pull request #28 from rockamorales/master

Modificaciones
Merge pull request #139 from schumy21/master

schumy29Abr
Merge pull request #32 from rockamorales/master

Modificaciones