Merge branch 'master' into develop
Update readme
Merge branch 'develop'

* develop:
  Update readme