update README
merge master into db