Merge pull request #11 from protectedfor/master

Merge pull request #18 from ermekhvtr/master