Release 1.0.0 merge