Merge pull request #6 from zablotski/EA-1

Ea 1
Merge pull request #7 from zablotski/master

Merge pull request #6 from zablotski/EA-1