Issue #15 closed