docu wiki added
Merge origin/master