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