eidt 2
Merge pull request #3 from pinguo-yangbing/master

eidt 2