Merge pull request #201 from wangbailin/master

tip
view
Merge remote branch 'upstream/master'