zhanba pull request
Merge pull request #142 from zhanba/master

zhanba pull request