close #21
this is rebased (as a new, clean branch) from the previous MR, where there are additional review comments: !65 (closed)