Resolve Issues #3 and #7