Issue #92 ,modified UMl