Merge branch 'master' into dev
updated descriptions
Merge branch 'dev'