added docs
merge