Merging updates to documentation