Full version1.0
Merge branch 'dev'