Merge pull request #522 from LuttyYang/master