Merge pull request #1 from RichmondDay/master

Syncing master to development
Merge pull request #2 from RichmondDay/development

Merge pull request #1 from RichmondDay/master