readme updates
merge upstream