Note: This MR should be rebasable on top of MR !7 (merged) with minimal conflicts, so it would be good to merge !7 (merged) first.

closes #9 (closed)