fix #33
close #20