最后修改版
Merge branch 'master' of http://github.com/xknxkn/xkntest