Merge pull request #530 from jjlin/master