Fixed some stuff
Merge pull request #1 from BorisKozo/master

Fixed some stuff