DEP-26 DEP-27
Merge pull request #1 from maciejborkowski/dev

DEP-26 DEP-27