Merge v0.1.2