Merge pull request #873 from arjendekorte/patch-5