Merge pull request #1218 from patrickslin/patch-2