Cleaned up use of MailAddress
Merge pull request #108 from mezz/tradingCleanup

Cleaned up use of MailAddress
Merge remote-tracking branch 'remotes/origin/master' into master-origin