Merge pull request #503 from LuttyYang/master