yushulx Merge pull request #2 from lincoln2018/patch-2