Merge branch 'dev'
update to version1.0.1
Merge branch 'master' into dev