Merge pull request #204 from ruijunhuang2010/master

update