Merge pull request #1 from zjuconan/master

new one
Merge pull request #4 from Naiqin/master

Merge pull request #1 from zjuconan/master