update/optimise docs
Merge branch 'master' into develop