Merge pull request #16 from rockamorales/master

Merge all
Merge pull request #47 from schumy21/master

schumy