Merge pull request #513 from LuttyYang/master