fix_issue_#121
Merge pull request #122 from ifeiteng/fix_issue_#121

fix_issue_#121