Issue #14 closed