added more documentation
Merge branch 'develop' into bernhard