Closed #8 and #10