Merge branch 'master' into dev
Add CONTRIBUTING.md
Merge branch 'dev'