Merge pull request #23 from nromanen/dmitry

Dmitry
Merge pull request #24 from nromanen/master

master->edd(11.01.2014_3)
Merge pull request #25 from nromanen/edd

Merge pull request #24 from nromanen/master
before merge
before merge
 min changes before merge
Merge pull request #26 from nromanen/edd

Edd
Merge pull request #27 from nromanen/master

Merge