Issue #124 implemented