Proposed in #15
Proposed in #15