documentation updates
update develop with documentation changes

Merge branch 'master' into develop