Merge pull request #2 from dawnfan/master

dalala
no bug but stupid
Merge pull request #2 from D-W-/master

no bug but stupid