DEP-58
Merge pull request #57 from maciejborkowski/dev

DEP-58