tj Merge pull request #88 from hollingberry/patch-1 …