DEP-74 version with qualifier
Merge pull request #103 from maciejborkowski/dev

DEP-74 version with qualifier