DEP-45 refactoring
Merge pull request #47 from maciejborkowski/dev

DEP-45 refactoring