added more documentation
Merge branch 'documentation' into develop