Update documentation in the readme.
Merge branch 'master' into develop