Issue #34 was implemented