fix #22
close #23