bugfix
Merge pull request #162 from jianling/master

bugfix