Merge pull request #18 from OpenMandrivaSoftware/adapt