Merge pull request #1 from goodnighthsu/master

获取最新
修改bug 11/18
Merge pull request #7 from MichaelYNWA/master

修改bug 11/18