Merge pull request #17 from ermekhvtr/master

Zada4e