Merge pull request #2 from definetux/master

Second attempt
Merge pull request #6 from IrinaUkrainets/master

Merge pull request #2 from definetux/master