use version 1.0
Merge branch 'master' into 1.0
Merge branch '1.0'