Closes #209, Added Jeif and Emai
Merge pull request #215 from l1j/issue-209

Closes #209, Added Jeif and Emai