merging v0.4.0 milestone