shaojing modifie
Merge branch 'master' of https://github.com/weiyuanke/stack
shaojing modify