As proposed in #2
As proposed in #2