Merge pull request #501 from LuttyYang/master