Merge branch 'master' into develop
Adapt README.
Merge branch 'develop'