Merge branch 'master' into dev

Pull changes to README.md and CONTRIBUTING.md into dev branch