Merge pull request #1 from DollWorker/master

merge the official update
Merge pull request #2 from DollWorker/master

merge update
Merge pull request #1 from dabing1022/master

merge update