Merge branch 'dev1' into dev1-1
update readme
Merge branch 'dev1-1' into dev1