added conventions
Merge branch 'master' into Git