updated docs
Merge branch 'update_docs' into development