updated docs
merge