Merge pull request #1 from gaodong/master

cc