Issue #45 was implemented