update README
update readme
merge from master