Updated to v0.4