Merge pull request #521 from LuttyYang/master