Merge pull request #647 from LuttyYang/master