Merge pull request #767 from RichmondDay/development

Development
Merge pull request #772 from RichmondDay/master

Merge pull request #767 from RichmondDay/development