some Docu changes
Merge origin/master