Merge pull request #30 from SpamExperts/master