Resolve Issue #25