Enhance/issue22

fix #22