Merge pull request #854 from RichmondDay/master

Syncing master to dev
Merge pull request #855 from RichmondDay/development

Merge pull request #854 from RichmondDay/master