update README
merge master