Issues #6 and #7