Issue #52, add UML