Merge branch '1.0.0'