Issue #3 closed