Issue #76, Fix UML