Merge pull request #1 from tuxianof/master

Nueva Actualziacion
Merge pull request #2 from cristianh/master

Merge pull request #1 from tuxianof/master