Merge pull request #8 from v4l3nt1n/master

sincronizacion ramas
Merge pull request #9 from v4l3nt1n/dev-maru

Merge pull request #8 from v4l3nt1n/master