Merge pull request #222 from svost/QT