Issue #21 implemented