Merge pull request #2 from MSoPo/master

Merge
Cambios día 19

Cambios día 19
Merge pull request #7 from cabalerho/master

Cambios día 19