Merge pull request #22 from wigtor/master

asd2
Merge pull request #23 from wigtor/master

Copiando desde G1 a G4
Merge pull request #49 from dquinteros/master

G4 a G1