add a couple of lines to docs
Merge branches 'master' and 'update_docs'