Merge pull request #132 from mackk/master

merge
Colecturia
Merge pull request #27 from rockamorales/master

Modificaciones