Final improvements for v0.2.0