update readme
merge changes