some changes
close #38.