Merge pull request #1 from hluguoj/luguo

test