Updates for release v0.3.6