Merge pull request #1 from gerrytucker/develop

Develop
Merge pull request #2 from gerrytucker/master

Merge pull request #1 from gerrytucker/develop