Updated to v0.3