update README
merge upstream changes
Merge branch 'master' into edge