bugfix
Merge pull request #163 from jianling/dev

bugfix