Add evil-exchange
Merge pull request #1454 from chrueg/master

Add evil-exchange