[issue#79] fixed conflics
[issue #79] fixed UML
 [issue #79] removed UML
[issue #79] added UML again