fixed
Merge branch 'master' of github.com:huxinghai1988/demo