Code refactoring
Merge pull request #27 from piotrglazar/feature/code-refactoring

Code refactoring