Merge pull request #1 from huangjian77/master

更新代码
Merge pull request #2 from newenter/master

2013-4-3