DEP-68
Merge pull request #90 from maciejborkowski/dev

DEP-68