Update API docs
Merge