Issue #1 closed