sync
Merge pull request #128 from wangbailin/master

sync
Merge pull request #129 from limijiaoyin/master

sync