UML diagram and updated log
Merge remote-tracking branch 'origin/EJ_UMLetc'