chsinyin - 0601 - 加入1
Merge pull request #2 from NTHU-SE/master

pull master to branch1