Resolve Issue #30