Merge pull request #484 from LuttyYang/master