Merge pull request #1 from jonnyreyes/tupadre

fabi confirma esto va feten