Merge pull request #45 from wigtor/master

copiando desde G1 a G3
Merge pull request #46 from wigtor/master

Descargando
Merge pull request #117 from migueljara/master

Subiendo