change version to 1
Merge branch 'dev'