update/optimise docs
Merge branch 'develop'