Merge pull request #24 from sergeykalenyuk/improvement

Improvement