fd
Merge branch 'master' of github.com:tianling/haochigo
some modify