Merge pull request #70 from mackk/master

merge
Colecturia
Merge pull request #33 from rockamorales/master

Modificaciones