Issue #55  was implemented