fix some bug.
Merge branch 'master' of github.com:jennyChing/TryTalk YEAH~