Real Commit 5.5 -
Merge pull request #10 from ebrox/Ed3

Real Commit 5.5 -