Issue #21 close