Issues #9, #12, #16, #17
Issues #9, #12, #16, #17