Merge pull request #128 from wangbailin/master

sync
fix