修复bug
待发布上线
Merge pull request #63 from wangxiao/master

待发布上线
Merge branch 'master' of git://github.com/wandoulabs/satan