Merge pull request #2 from luwei0917/master

fixup
Merge pull request #6 from luwei0917/master

a
Merge pull request #28 from luwei0917/Wei_Lu

Wei lu
Merge pull request #29 from luwei0917/Wei_Lu

a
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu
hehe
Merge pull request #30 from kitsuneh/master

hehehe
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu
a