Merge pull request #24 from rockamorales/master

Modificaciones
Merge pull request #25 from mackk/master

Modificaciones
Merge pull request #134 from schumy21/master

schumy22