Merge pull request #767 from RichmondDay/development

Development