Merge branch 'master' into dev
Fixed readme
Merge branch 'dev'