fix #36
Merge pull request #51 from PuZheng/issue36

fix #36