v0.4.0: Hardening and some new features