Merge pull request #270 from ruijunhuang2010/master

update