fixes #70
Merge branch 'master' into task_benedikt