Merge v1.0.0