Merge pull request #3 from lmcadoo2/master

Master
Merge pull request #4 from lmcadoo2/develop

Merge pull request #3 from lmcadoo2/master