Merge pull request #21 from rockamorales/master

Modificaciones
Merge pull request #22 from rockamorales/master

Modificaciones
Merge pull request #23 from rockamorales/master

Modificaciones
Merge pull request #131 from schumy21/master

Schum20