Merge pull request #58 from windyarts/master

Improve GA
第一轮测试修复bug
Merge pull request #59 from wangxiao/master

第一轮测试，bug修复
Merge branch 'master' of git://github.com/wandoulabs/satan
Bugs fixed