Issue #24 closed