close #16 and #20
close #16 and #20