Updating documentation
merge