Merge pull request #133 from keyuebao/keyue/issue-132