merging 1.0.0