Fixes Issues #1 and #2