Merge pull request #22 from rockamorales/master

Modificaciones Schumy
Merge pull request #50 from mackk/master

merge