Merge pull request #12 from rockamorales/master

Modificaciones
Merge pull request #38 from schumy21/master

Schumy06/03/2013