Merge pull request #4 from yanzhen0610/patch-2