Merge pull request #28 from schumy21/master

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

mod