Merge pull request #121 from wimme/patch-1