Merge v1.0.1