Merge pull request #36 from Wuisch/dirk

Merge Dirk
fixed
Merge pull request #37 from Wuisch/document

fixed
Merge branch 'master' into dirk