fix set bug
Merge branch 'dev'
update README
Merge branch 'dev'