Merge pull request #1 from jeremyz/eo_new_format

Eo new format