Merge pull request #854 from RichmondDay/master

Syncing master to dev