Issue #142 implemented