fix #35
Merge pull request #36 from xuwei-k/fix35

fix #35