added feature of Issue #11