Merge "Improved the documentation"