Issue #37 was implemented