Merge pull request #1144 from LuttyYang/master