Issue #110 partially implemented