merge in v1.0