Issue #54 was implemented