Merge pull request #1 from carlosrojaso/master

Actualiza