Merge "Better class documentation"