Resolve Issue #21