update readme
merge branch