resolve issue #77 and PR #32
Merge pull request #79 from msimerson/spamassassin

resolve issue #77 and PR #32