merge branch 1.0