fix other
Merge pull request #252 from Verkalets/fixing

fix other
Merge pull request #253 from Verkalets/dev

Dev