Merge pull request #1256 from patrickslin/patch-5