fix #18
fix #18
Merge pull request #57 from PuZheng/issue18

fix #18