Merge pull request #521 from zhaoyk/master