Merge "Improve the Class documentation."