Merge pull request #1 from franklyfeathered/master

Master
Merge pull request #2 from franklyfeathered/develop

Merge pull request #1 from franklyfeathered/master