some fixes
erge branch 'master' of https://github.com/yymao/kipac-tea