trying to sync the 2 branches

Merge pull request #3 from lmcadoo2/master