Updated to v0.5