Classes diagrams in images.
Merge origin/master