UML diagram
Merge origin/master