x
Merge pull request #10 from satzcoal/lee_edit

Lee edit 1120
Merge branch 'xiaoyu'