Merge pull request #866 from arjendekorte/patch-4