Merge pull request #10 from protectedfor/master

Merge pull request #17 from ermekhvtr/master
Merge pull request #18 from ermekhvtr/master

Merge pull request #10 from protectedfor/master