Merge pull request #24 from nromanen/master

master->edd(11.01.2014_3)