Final Commit 2 - Forgot something... of course.
Merge pull request #19 from ebrox/Ed3

Final Commit 2 - Forgot something... of course.