Issue #7 closed