fixes fixes
Merge pull request #85 from VladimirKorzh/dev

fixes fixes