Fixes
Merge branch 'master' of https://github.com/tnc-ba/doku