Merge pull request #19 from sergeykalenyuk/improvement

Fix code style.
Merge pull request #20 from sergeykalenyuk/improvement

Improvements