update docs
merge documentation