Merge pull request #246 from wangbailin/master

live-empty
baidu
Merge remote branch 'upstream/master'