Merge pull request #109 from mexon/mailstream