Merge pull request #139 from schumy21/master

schumy29Abr
Merge pull request #29 from rockamorales/master

Modificaciones