Merge with v0.2