Merge pull request #1 from xfxyjwf/master

cc