Issue #28 closed