Merge pull request #2 from djboy71/master

Merge