Merge pull request #13 from rockamorales/master

Merge all
Merge pull request #116 from schumy21/master

schumy