Merge pull request #1 from zjuconan/master

new one