update readme
merge master