Update docs
Completed merge