Merge pull request #1248 from patrickslin/patch-4