修复若干bug
Merge branch 'master' of https://github.com/lien1992/geek