Merge pull request #15 from wigtor/master

Descargado Repositorio
Merge pull request #37 from migueljara/master

Copiando desde G3 a G1