Merge pull request #65 from ea-open-source/main

Merge pull request #65 from ea-open-source/main #79