Partially updated README.
Merge branch 'master' into docs
Documentation