Merge pull request #1216 from patrickslin/patch-5