Merge branch 'master' into dev
Readme update
Merge branch 'dev'