Merge branch 'master' into develop
Updated readme
Merge branch 'develop'