v0.0.4: simplify implementation