Merge pull request #1 from hopeztm7500/develop

Merge to master
Merge pull request #2 from hopeztm7500/master

Merge pull request #1 from hopeztm7500/develop