Update/Add mailcatcher
Merge pull request #14 from Rud5G/update-mailcatcher

Update/Add mailcatcher