Merge pull request #246 from sneuf/patch-1