Merge pull request #1 from HelloKitys/master

1
Merge pull request #2 from wy19890204/master

3