Merge branch 'master' of https://github.com/huhuo/general.git

Signed-off-by: eboyRS <eboyasaboy@gmail.com>
Merge branch 'master' of https://github.com/huhuo/general.git