Updated to v0.3.6