zhemao Merge pull request #1 from lowks/patch-1 …