Move to v0.3.5