Fix/issue#39

fix issue#39