Merge pull request #1 from carlosbollero/master

Este pull request debería ser el bueno
Merge pull request #7 from RodrigoOlivera/master

Merge pull request #1 from carlosbollero/master