Merge "updating documentation"