Merge pull request #1208 from jy2wong/master