ahankinson Merge pull request #2 from paul-bayleaf/fix-issue-1