jing merge peng's issue_2 with master

issue 2

issue 2
Merge pull request #2 from pengzang/issue_2

issue2