Update version
merge branch 1.0.0