Merge pull request #80 from cbergh/patch-1