minor fixes
Merge branch 'master' of github.com:Frodox/mephi_labs