Issue #17 closed