Merge pull request #197 from nilleb/patch-1