As !35 (closed) diverged way too far from the master, this is the follow-up MR after !34 (merged) has been merged.
Following changes will be included with this:
Closes #54 (closed)