Merge branch 'master' into moduleIssue
Update CONTRIBUTING.md