Update readme
merge master