Merge pull request #2 from luwei0917/master

fixup
Merge pull request #6 from luwei0917/master

a
hehe
Merge pull request #30 from kitsuneh/master

hehehe