Merge pull request #23 from rockamorales/master

Modificaciones
Merge pull request #24 from rockamorales/master

Modificaciones
Merge pull request #130 from mackk/master

unknown