- added some code-doku
Merge origin/master