Merge v0.4