Merge pull request #444 from Jeroenz0r/patch-2