Merge pull request #18 from rockamorales/master

Mauro
Merge pull request #19 from rockamorales/master

Mauro
Merge pull request #126 from schumy21/master

Schumy14