Issue #26 closed