Merge branch 'master' into develop
Updating readme
Merge branch 'develop'