Updating docs
Merging