Issue #6 closed