baidu
Merge remote branch 'upstream/master'
Merge pull request #257 from wangbailin/master

baidu