update docs
merge upstream