Merge pull request #1 from hopeztm7500/develop

Merge to master