more documentation.
Merge branch 'develop'