bittercoder Merge pull request #30 from heguangyu5/patch-1