bugs fixed
Merge branch 'dev' of https://github.com/AlesDokshanin/CSharp---Itransition-1.git