partial
partial
fix #84
fix #84
fix #84
Merge pull request #91 from PuZheng/issue84

Issue84