Merge pull request #95 from kilburn/patch-2