Issue #37 implemented