DEP-68 fixed bug
Merge pull request #91 from maciejborkowski/dev

DEP-68 fixed bug