Closes #209, Added Jeif and Emai