fixes #30
Merge branch 'master' into docu/11_4/1