Documentation updates (develop)

Same as PR #324, on develop.