Improve EG
v3.0.0
Merge pull request #14 from risgk/develop

v3.0.0