Merge pull request #481 from LuttyYang/master