Merge pull request #24 from rockamorales/master

Modificaciones
Merge pull request #67 from schumy21/master

Schumy20