Merge pull request #63 from wangxiao/master

待发布上线
Merge branch 'master' of https://github.com/wandoulabs/satan
修复bug