Issue #58: implemented