fixed
conflict
fixed
Merge pull request #207 from wangbailin/master

fixed