Issue #46 , fixed UML