Issue #25 closed