Minor fixes in docs
Minor fixes
Merge branch 'master' into production