Last fixes
Merge pull request #3 from Kafedra/master

Last fixes