Closes #91 (closed).
This MR is connected to SADE-Project!15 (merged) (but they're not dependend on each other).