close #20 refactor
#20 refactor
#20 refactor
#20 refactor
1.0.2