Upgrading to v0.3.5