Issue #31 was implemented