fix #20
fix #22, close #21