Resolve Issue #1 and #3