Merge pull request #1 from dnlserrano/master

ja ca estamos