merge v1.0.2