Merge pull request #78 from nromanen/master

m
29.01
after merge
fix after merge