Merge "Correct documentation"