Issues #8 and #9: Done.