Merge v0.3.0