simplify the comments
Merge remote-tracking branch 'upstream/master'
this is shanghai
Merge pull request #1 from wangzhesjtu/shanghai

Shanghai