Merge pull request #5 from luwei0917/master

zeng
Merge remote-tracking branch 'remotes/origin/kitsune' into Wei_Lu