more doc changes
Merge branch 'develop'