Issue #4 closed