Merge pull request #34 from rockamorales/master

Modificaciones
Linea XD
Linea XD
Merge pull request #73 from mackk/master

mod