fix some bug
Merge branch 'dev' of git://github.com/loggerhead/wutong into dev
fix some bug