Merge branch 'develop' into optimization
Documentation update

Small doc updates.
Doc update

Small doc update, merging optimization branch