Merge pull request #35 from nromanen/master

master->dmitry
jan13evening
Merge pull request #37 from nromanen/dmitry

Dmitry-m
Merge pull request #38 from nromanen/edd

Edd-m
Merge pull request #40 from nromanen/master

m->d