Issue #46, added UML