Merge pull request #559 from ploeh/patch-2