Merge pull request #221 from svost/qt