Merge pull request #216 from svost/qt-solution