Merge pull request #25 from rockamorales/master

Modificaciones
Merge pull request #68 from schumy21/master

Schumy20_2