Real Commit 6 - several small changes
Merge pull request #11 from ebrox/Ed3

Real Commit 6 - several small changes