Merge pull request #2 from goodnighthsu/master

获取最新12/23
Merge pull request #8 from MichaelYNWA/master

Merge pull request #2 from goodnighthsu/master