Issue #22 closed