Update to v0.3.6