Merge "Improved documentation"