Merge pull request #92 from nrub/patch-1