Close Issue #22.