Merge pull request #2 from pengzang/issue_2

issue2
issue3 from peng