Issue #240 , added UML