Merge pull request #17 from rockamorales/master

colecturia
Merge pull request #123 from schumy21/master

schumy13