merge v1.0