Merge pull request #1143 from bobvanderlinden/patch-1