siyu's commit
Merge pull request #16 from serenechen/master

 siyu's commit