Merge pull request #1 from BlueGood/master

Merge pull request #1 from BlueBest/master
Merge pull request #2 from BlueBest/master

Merge pull request #1 from BlueGood/master