Issues #4 and #5