合并jonix的代码
Merge pull request #31 from XChinux/master

merge jonix's tianchi repo.