TEST add-eviljlord
Merge pull request #560 from eviljlord/add-eviljlord

Merging PR from @eviljlord