Merge pull request #4 from lmcadoo2/develop

Merge pull request #3 from lmcadoo2/master
Merge pull request #5 from lmcadoo2/master

trying to sync the 2 branches