Merge pull request #234 from wimme/patch-2