quick update of docs
Merge branch 'docs'