some bug fix
Merge branch 'master' of https://github.com/ltearain/chicken.git