commit by elvis
Merge branch 'master' of github.com:bugzero/tongxunlu