taras
Merge pull request #103 from Verkalets/fix_29

taras
Merge pull request #104 from Verkalets/dev

Dev