Merge pull request #218 from wangbailin/master

update
for pr
Merge remote branch 'upstream/master'