Improve documentation
Merge branch 'extend_docu' into dev
Fix typo