closes #142 (closed)
In parallel, also check a suggestion of refactoring: !284 (merged)
/cc @mlinhoff /cc @mdalchen