Merge "Adding documentation"