new code
changed
Merge pull request #1 from chenheng0611/master

chenheng