added docs
fixed merge