Merge pull request #14 from rockamorales/master

Mas modificaciones
Linea XD
Merge pull request #113 from mackk/master

merge