Closed #5 and closed #10