Merge pull request #25 from nromanen/edd

Merge pull request #24 from nromanen/master
Merge pull request #26 from nromanen/edd

Edd
Merge pull request #27 from nromanen/master

Merge
Merge pull request #28 from nromanen/dmitry

Merge pull request #27 from nromanen/master
Merge pull request #29 from nromanen/master

Merge