Merge pull request #479 from LuttyYang/master