Merge pull request #14 from VladyslavKurmaz/master

A lot of changes