fix bug
Merge branch 'master' of github.com:tuoxie007/Tweet4China2
fix bugs