hehe
Merge pull request #1 from fanzy446/master

hehe