Issue #21 closed