Issue #11 closed