Issue #36 was implemented